Fix xen-init-name to not fail looking for a nonexistent 'config' entry in xl's JSON...

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>

diff --git a/debian/changelog b/debian/changelog
index ffd5da5fe6fd974d43e27b40e7875632b3d5c1b3..4decc81b6b0e62ff0a9b3de2fe4b1f880e21560e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ xen (4.8.0~rc5-2~) unstable; urgency=medium
     attaches. (Closes: #770456)
   * Remove correct pidfile when stopping xenconsoled.
 
+  [ Lubomir Host ]
+  * Fix xen-init-name to not fail looking for a nonexistent 'config'
+    entry in xl's JSON output.  Closes:#818129.
+
  --
 
 xen (4.8.0~rc5-1) unstable; urgency=medium

diff --git a/debian/scripts/xen-init-name b/debian/scripts/xen-init-name
index 0efcb85da0ee054b595806e59690e0786f177ec5..21aad6fd4898e136b5366c1d230c89847e7a80e2 100755 (executable)
--- a/debian/scripts/xen-init-name
+++ b/debian/scripts/xen-init-name
@@ -39,7 +39,7 @@ class Data(object):
 class DataJSON(Data):
     def __init__(self, p):
         s = json.loads(p)
-        self.name = s['config']['c_info']['name']
+        self.name = s['c_info']['name']
 
 
 class DataSXP(Data):